projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ab0234 b1b326b)
bitkeeper revision 1.1389.15.15 (428242f7nXN4g9eyz6qI4P8iLGAGTg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 11 May 2005 17:37:59 +0000 (17:37 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 11 May 2005 17:37:59 +0000 (17:37 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

1  2 
tools/libxc/xc_linux_build.c patch | diff1 | diff2 | blob | history
tools/libxc/xc_plan9_build.c patch | diff1 | diff2 | blob | history
tools/libxc/xc_vmx_build.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc_linux_build.c
Simple merge
diff --cc tools/libxc/xc_plan9_build.c
Simple merge
diff --cc tools/libxc/xc_vmx_build.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.